# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/06/10 14:17:00-06:00 bjorn.helgaas@hp.com
# Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
# into hp.com:/home/helgaas/linux/linux-ia64-2.4
#
# include/linux/pci_ids.h
# 2004/06/10 14:16:58-06:00 bjorn.helgaas@hp.com +0 -0
# Auto merged
#
# Makefile
# 2004/06/10 14:16:58-06:00 bjorn.helgaas@hp.com +0 -0
# Auto merged
#
# Documentation/Configure.help
# 2004/06/10 14:16:58-06:00 bjorn.helgaas@hp.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/10 14:15:40-06:00 arun.sharma@intel.com
# [PATCH] ia64: tighten FPH state context switch check
#
# In the absence of this patch, a process can set it's own mfh bit and
# potentially view another process's high floating point registers. So a
# check is needed.
#
# Signed-off-by: Arun Sharma <arun.sharma@intel.com>
# Signed-off-by: David Mosberger <davidm@hpl.hp.com>
#
# include/asm-ia64/system.h
# 2004/06/10 14:15:12-06:00 arun.sharma@intel.com +1 -1
# ia64: tighten FPH state context switch check
#
# ChangeSet
# 2004/06/07 21:13:31-03:00 B.Zolnierkiewicz@elka.pw.edu.pl
# [PATCH] ide: add new nForce IDE/SATA device IDs to amd74xx.c
#
# Hi,
#
# Please merge this patch. I hope it applies cleanly.
#
# [PATCH] ide: add new nForce IDE/SATA device IDs to amd74xx.c
#
# From: "Brian Lazara" <blazara@nvidia.com>
#
# Add device IDs for new nForce IDE and SATA controllers. Rename some of
# the existing controller names to correctly match released product names.
#
# include/linux/pci_ids.h
# 2004/05/17 16:04:30-03:00 B.Zolnierkiewicz@elka.pw.edu.pl +6 -0
# ide: add new nForce IDE/SATA device IDs to amd74xx.c
#
# drivers/ide/pci/amd74xx.h
# 2004/05/17 16:08:04-03:00 B.Zolnierkiewicz@elka.pw.edu.pl +72 -6
# ide: add new nForce IDE/SATA device IDs to amd74xx.c
#
# drivers/ide/pci/amd74xx.c
# 2004/05/17 17:27:31-03:00 B.Zolnierkiewicz@elka.pw.edu.pl +14 -1
# ide: add new nForce IDE/SATA device IDs to amd74xx.c
#
# ChangeSet
# 2004/06/07 21:12:30-03:00 B.Zolnierkiewicz@elka.pw.edu.pl
# [PATCH] clarify help entries for Promise IDE drivers a bit
#
# [PATCH] clarify help entries for Promise IDE drivers a bit
#
# Some bits from -ac and "O.Sezer" <sezero@superonline.com>.
#
# linux-2.4.27-pre1-bzolnier/Documentation/Configure.help | 33 ++++++++++------
# linux-2.4.27-pre1-bzolnier/drivers/ide/Config.in | 8 +--
# 2 files changed, 25 insertions(+), 16 deletions(-)
#
# drivers/ide/Config.in
# 2004/05/22 17:30:37-03:00 B.Zolnierkiewicz@elka.pw.edu.pl +4 -4
# clarify help entries for Promise IDE drivers a bit
#
# Documentation/Configure.help
# 2004/05/22 17:35:16-03:00 B.Zolnierkiewicz@elka.pw.edu.pl +21 -12
# clarify help entries for Promise IDE drivers a bit
#
# ChangeSet
# 2004/06/07 17:45:44-03:00 shurick@sectorb.msk.ru
# [PATCH] i2c-matroxfb and i2c initialization order
#
# Since i2c-matroxfb is initialized before i2c subsystem,
# there are troubles with accessing this module via i2c interface.
#
# Makefile
# 2004/06/03 11:29:19-03:00 shurick@sectorb.msk.ru +1 -1
# i2c-matroxfb and i2c initialization order
#
# ChangeSet
# 2004/06/07 17:34:57-03:00 marcelo@logos.cnet
# Thomas Winischhofer: sisfb update
#
# attached is an update for the sisfb driver to version 1.7.10. The
# obnoxious bug that stopped 1.7.3 is now fixed.
#
# - fixes for pure 64bit and 32/64bit mixed systems, (add ioctl
# conversion; fix variable sizes, etc)
# - fixes for 301C video bridge, (scales TV output correctly now)
# - fixes for 1600x1200 and 1400x1050 LCD panels,
# - added support for HDTV (HiVision and YPbPr),
# - added support for PAL-M and PAL-N (S-video and CVBS),
# - many fixes for 661/741/760 (amongst others, proper LFB support
# for the 760 and corrections for SiS' new BIOS data layout;
# would lead to display corruption with old driver)
# - add support for many modes for LCD which were unsupported
# previously,
# - a major clean up and reduction of the fbdev code,
# - enhanced communication with the X driver,
# - ability to relocate the image on the TV screen using a
# userland tool,
# - added Documentation/fb/sisfb.txt (why the heck was this missing?!)
# - small fix for SiS DRM driver (match 32/64bit fixes mentioned above)
# (cast the data passed to sis_free as u32)
# - small text fix for Configure.help (mention newer chipsets and
# variants thereof)
# - make driver re-entrant by avoiding static structures and variables.
#
# Signed-off-by: Thomas Winischhofer <thomas@winischhofer.net>
#
# The patch looks larger than it is. In fact, a major part consists of the
# last of the mentioned changes (moved away from static structures to
# allocated ones, requiring a lot of trivial "." -> "->" code changes).
#
# As usual, heavily tested. The mode switching code is even lab-tested by
# SiS (although 100% written by me). Please apply asap (especially since
# 64bit systems were not properly supported previously; current
# X.org/XFree86 needs this update for proper communication with the
# framebuffer driver on 64bit systems).
#
#
# include/linux/sisfb.h
# 2004/06/01 15:45:31-03:00 marcelo@logos.cnet +77 -193
# Import patch sisfb.diff
#
# drivers/video/sis/vstruct.h
# 2004/05/19 16:23:24-03:00 marcelo@logos.cnet +3 -0
# Import patch sisfb.diff
#
# drivers/video/sis/vgatypes.h
# 2004/06/01 15:45:49-03:00 marcelo@logos.cnet +31 -68
# Import patch sisfb.diff
#
# drivers/video/sis/sis_main.h
# 2004/06/01 19:33:52-03:00 marcelo@logos.cnet +300 -668
# Import patch sisfb.diff
#
# drivers/video/sis/sis_main.c
# 2004/06/01 18:13:05-03:00 marcelo@logos.cnet +2763 -2757
# Import patch sisfb.diff
#
# drivers/video/sis/sis_accel.h
# 2004/05/30 15:31:49-03:00 marcelo@logos.cnet +142 -275
# Import patch sisfb.diff
#
# drivers/video/sis/sis_accel.c
# 2004/06/01 16:49:13-03:00 marcelo@logos.cnet +192 -186
# Import patch sisfb.diff
#
# drivers/video/sis/sis.h
# 2004/06/01 16:47:37-03:00 marcelo@logos.cnet +504 -2
# Import patch sisfb.diff
#
# drivers/video/sis/osdef.h
# 2004/06/01 19:33:52-03:00 marcelo@logos.cnet +2 -6
# Import patch sisfb.diff
#
# drivers/video/sis/oem310.h
# 2004/05/19 16:23:24-03:00 marcelo@logos.cnet +21 -1
# Import patch sisfb.diff
#
# drivers/video/sis/oem300.h
# 2004/05/19 16:23:24-03:00 marcelo@logos.cnet +1 -0
# Import patch sisfb.diff
#
# drivers/video/sis/initdef.h
# 2004/05/19 16:23:24-03:00 marcelo@logos.cnet +17 -3
# Import patch sisfb.diff
#
# drivers/video/sis/init.h
# 2004/06/01 19:33:56-03:00 marcelo@logos.cnet +53 -21
# Import patch sisfb.diff
#
# drivers/video/sis/init.c
# 2004/05/25 20:06:35-03:00 marcelo@logos.cnet +138 -203
# Import patch sisfb.diff
#
# drivers/video/sis/init301.h
# 2004/06/01 19:33:59-03:00 marcelo@logos.cnet +51 -56
# Import patch sisfb.diff
#
# drivers/video/sis/init301.c
# 2004/06/01 10:09:21-03:00 marcelo@logos.cnet +859 -1083
# Import patch sisfb.diff
#
# drivers/video/sis/310vtbl.h
# 2004/05/19 16:23:24-03:00 marcelo@logos.cnet +121 -110
# Import patch sisfb.diff
#
# drivers/video/sis/300vtbl.h
# 2004/05/19 16:23:24-03:00 marcelo@logos.cnet +88 -87
# Import patch sisfb.diff
#
# drivers/char/drm/sis_mm.c
# 2004/05/21 22:38:28-03:00 marcelo@logos.cnet +1 -1
# Import patch sisfb.diff
#
# Documentation/ioctl-number.txt
# 2004/05/26 19:36:46-03:00 marcelo@logos.cnet +2 -1
# Import patch sisfb.diff
#
# Documentation/Configure.help
# 2004/05/21 22:44:03-03:00 marcelo@logos.cnet +6 -5
# Import patch sisfb.diff
#
# ChangeSet
# 2004/06/07 17:32:31-03:00 marcelo@logos.cnet
# Cset exclude: marcelo@logos.cnet|ChangeSet|20040606231521|43962
#
# include/linux/sisfb.h
# 2004/06/07 17:32:22-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/vstruct.h
# 2004/06/07 17:32:22-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/vgatypes.h
# 2004/06/07 17:32:22-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/sis_main.h
# 2004/06/07 17:32:22-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/sis_main.c
# 2004/06/07 17:32:22-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/initdef.h
# 2004/06/07 17:32:22-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# Documentation/ioctl-number.txt
# 2004/06/07 17:32:22-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# Documentation/Configure.help
# 2004/06/07 17:32:22-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/osdef.h
# 2004/06/07 17:32:21-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/oem310.h
# 2004/06/07 17:32:21-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/oem300.h
# 2004/06/07 17:32:21-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/init301.h
# 2004/06/07 17:32:21-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/init301.c
# 2004/06/07 17:32:21-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/init.h
# 2004/06/07 17:32:21-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/init.c
# 2004/06/07 17:32:21-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/sis_accel.h
# 2004/06/07 17:32:20-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/sis_accel.c
# 2004/06/07 17:32:20-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/sis.h
# 2004/06/07 17:32:20-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/310vtbl.h
# 2004/06/07 17:32:20-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/video/sis/300vtbl.h
# 2004/06/07 17:32:20-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# drivers/char/drm/sis_mm.c
# 2004/06/07 17:32:20-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# Documentation/fb/sisfb.txt
# 2004/06/07 17:32:20-03:00 marcelo@logos.cnet +0 -0
# Exclude
#
# ChangeSet
# 2004/06/07 16:56:39-03:00 axboe@suse.de
# [PATCH] cdrom hardware defect mgt header length
#
# Hi Marcelo,
#
# cdrom_has_defect_mgt() has a bug where it doesn't use the feature code
# header length field correctly. The standard states that it is to contain
# the number of bytes _following_ that field, however the code uses it as
# a total length. The check isn't needed at all, since we check the value
# of the feature header anyways. So just kill it along with the 'often'
# comments - they are misleading, as it's a fixed value. So not 'often',
# 'always'.
#
# ===== drivers/cdrom/cdrom.c 1.15 vs edited =====
#
# drivers/cdrom/cdrom.c
# 2004/06/07 05:23:55-03:00 axboe@suse.de +8 -12
# cdrom hardware defect mgt header length
#
# ChangeSet
# 2004/06/06 20:13:27-07:00 hadi@zynx.com
# [NETFILTER]: Small interface cleanup for {ipt,ip6t,arpt}_find_target.
#
# Signed-off-by: Jamal Hadi Salim <hadi@zynx.com>
# Signed-off-by: David S. Miller <davem@redhat.com>
#
# net/ipv6/netfilter/ip6_tables.c
# 2004/06/06 20:13:18-07:00 hadi@zynx.com +9 -10
# [NETFILTER]: Small interface cleanup for {ipt,ip6t,arpt}_find_target.
#
# Signed-off-by: Jamal Hadi Salim <hadi@zynx.com>
# Signed-off-by: David S. Miller <davem@redhat.com>
#
# net/ipv4/netfilter/ip_tables.c
# 2004/06/06 20:13:18-07:00 hadi@zynx.com +10 -12
# [NETFILTER]: Small interface cleanup for {ipt,ip6t,arpt}_find_target.
#
# Signed-off-by: Jamal Hadi Salim <hadi@zynx.com>
# Signed-off-by: David S. Miller <davem@redhat.com>
#
# net/ipv4/netfilter/arp_tables.c
# 2004/06/06 20:13:18-07:00 hadi@zynx.com +8 -8
# [NETFILTER]: Small interface cleanup for {ipt,ip6t,arpt}_find_target.
#
# Signed-off-by: Jamal Hadi Salim <hadi@zynx.com>
# Signed-off-by: David S. Miller <davem@redhat.com>
#
# include/linux/netfilter_ipv6/ip6_tables.h
# 2004/06/06 20:13:18-07:00 hadi@zynx.com +2 -0
# [NETFILTER]: Small interface cleanup for {ipt,ip6t,arpt}_find_target.
#
# Signed-off-by: Jamal Hadi Salim <hadi@zynx.com>
# Signed-off-by: David S. Miller <davem@redhat.com>
#
# include/linux/netfilter_ipv4/ip_tables.h
# 2004/06/06 20:13:18-07:00 hadi@zynx.com +8 -0
# [NETFILTER]: Small interface cleanup for {ipt,ip6t,arpt}_find_target.
#
# Signed-off-by: Jamal Hadi Salim <hadi@zynx.com>
# Signed-off-by: David S. Miller <davem@redhat.com>
#
# include/linux/netfilter_arp.h
# 2004/06/06 20:13:18-07:00 hadi@zynx.com +1 -0
# [NETFILTER]: Small interface cleanup for {ipt,ip6t,arpt}_find_target.
#
# Signed-off-by: Jamal Hadi Salim <hadi@zynx.com>
# Signed-off-by: David S. Miller <davem@redhat.com>
#
# include/linux/netfilter.h
# 2004/06/06 20:13:18-07:00 hadi@zynx.com +6 -0
# [NETFILTER]: Small interface cleanup for {ipt,ip6t,arpt}_find_target.
#
# Signed-off-by: Jamal Hadi Salim <hadi@zynx.com>
# Signed-off-by: David S. Miller <davem@redhat.com>
#
# ChangeSet
# 2004/06/05 14:41:24-07:00 hadi@cyberus.ca
# [NET]: Add ARPHRD_NONE and use it in tun driver.
#
# include/linux/if_arp.h
# 2004/06/05 14:41:19-07:00 hadi@cyberus.ca +1 -0
# [NET]: Add ARPHRD_NONE and use it in tun driver.
#
# drivers/net/tun.c
# 2004/06/05 14:41:19-07:00 hadi@cyberus.ca +2 -2
# [NET]: Add ARPHRD_NONE and use it in tun driver.
#
# ChangeSet
# 2004/06/04 14:01:33-07:00 yoshfuji@linux-ipv6.org
# [UDPv4]: Pass correct socket to ip_mc_sf_allow.
#
# net/ipv4/udp.c
# 2004/06/04 14:01:29-07:00 yoshfuji@linux-ipv6.org +1 -1
# [UDPv4]: Pass correct socket to ip_mc_sf_allow.
#
# ChangeSet
# 2004/06/03 17:46:11-07:00 sri@us.ibm.com
# [SCTP] Fix poll() on a 1-1 style socket so that it returns when the
# association is aborted by peer.
#
# net/sctp/sm_sideeffect.c
# 2004/06/03 17:45:48-07:00 sri@us.ibm.com +4 -0
# [SCTP] Fix poll() on a 1-1 style socket so that it returns when the
# association is aborted by peer.
#
# ChangeSet
# 2004/06/03 17:40:16-07:00 sri@us.ibm.com
# [SCTP] Fix to wakeup blocking connect() after max INIT retries failed.
#
# net/sctp/socket.c
# 2004/06/03 17:40:07-07:00 sri@us.ibm.com +5 -1
# [SCTP] Fix to wakeup blocking connect() after max INIT retries failed.
#
# net/sctp/sm_sideeffect.c
# 2004/06/03 17:40:07-07:00 sri@us.ibm.com +3 -0
# [SCTP] Fix to wakeup blocking connect() after max INIT retries failed.
#
# ChangeSet
# 2004/06/03 17:33:41-07:00 sri@us.ibm.com
# [SCTP] Fix missing VTAG validation on certain incoming packets.
#
# net/sctp/sm_statefuns.c
# 2004/06/03 17:33:29-07:00 sri@us.ibm.com +34 -74
# [SCTP] Fix missing VTAG validation on certain incoming packets.
#
# include/net/sctp/sm.h
# 2004/06/03 17:33:28-07:00 sri@us.ibm.com +17 -0
# [SCTP] Fix missing VTAG validation on certain incoming packets.
#
# ChangeSet
# 2004/06/03 17:25:51-07:00 sri@us.ibm.com
# [SCTP] Fix the use of cached non-zero vtag in an INIT that is resent
# after a stale cookie error.
#
# net/sctp/sm_statefuns.c
# 2004/06/03 17:25:29-07:00 sri@us.ibm.com +3 -0
# [SCTP] Fix the use of cached non-zero vtag in an INIT that is resent
# after a stale cookie error.
#
# net/sctp/sm_sideeffect.c
# 2004/06/03 17:25:29-07:00 sri@us.ibm.com +3 -0
# [SCTP] Fix the use of cached non-zero vtag in an INIT that is resent
# after a stale cookie error.
#
# include/net/sctp/command.h
# 2004/06/03 17:25:29-07:00 sri@us.ibm.com +1 -0
# [SCTP] Fix the use of cached non-zero vtag in an INIT that is resent
# after a stale cookie error.
#
# ChangeSet
# 2004/06/03 17:20:19-07:00 jhh@lucent.com
# [SCTP] Fix to not start a new association on a 1-many style sendmsg()
# with MSG_EOF/MSG_ABORT flag and no data.
#
# net/sctp/socket.c
# 2004/06/03 17:20:09-07:00 jhh@lucent.com +5 -0
# [SCTP] Fix to not start a new association on a 1-many style sendmsg()
# with MSG_EOF/MSG_ABORT flag and no data.
#
# ChangeSet
# 2004/06/03 17:15:38-07:00 jhh@lucent.com
# [SCTP] Fix to not setup a new association if the endpoint is in
# SHUTDOWN_ACK_SENT state and recognizes that the peer has restarted.
#
# net/sctp/sm_statefuns.c
# 2004/06/03 17:15:32-07:00 jhh@lucent.com +25 -0
# [SCTP] Fix to not setup a new association if the endpoint is in
# SHUTDOWN_ACK_SENT state and recognizes that the peer has restarted.
#
diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help
--- a/Documentation/Configure.help 2004-06-10 15:42:16 -07:00
+++ b/Documentation/Configure.help 2004-06-10 15:42:16 -07:00
@@ -18690,6 +18690,11 @@
purpose port, say Y here. See
<http://www.dig64.org/specifications/DIG64_HCDPv10a_01.pdf>.
+Support for serial ports defined in ACPI namespace
+CONFIG_SERIAL_ACPI
+ If you wish to enable serial port discovery via the ACPI
+ namespace, say Y here. If unsure, say N.
+
Support for PowerMac serial ports
CONFIG_MAC_SERIAL
If you have Macintosh style serial ports (8 pin mini-DIN), say Y
diff -Nru a/Makefile b/Makefile
--- a/Makefile 2004-06-10 15:42:16 -07:00
+++ b/Makefile 2004-06-10 15:42:16 -07:00
@@ -93,6 +93,7 @@
CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-fno-strict-aliasing -fno-common
+CFLAGS += -g
ifndef CONFIG_FRAME_POINTER
CFLAGS += -fomit-frame-pointer
endif
@@ -307,8 +308,7 @@
$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
xconfig: symlinks
- $(MAKE) -C scripts kconfig.tk
- wish -f scripts/kconfig.tk
+ @echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***"
menuconfig: include/linux/version.h symlinks
$(MAKE) -C scripts/lxdialog all